Sea 178 test actions loading #110

jhazentia · 2024-02-20T16:20:03Z

Updated precommit versions and autoformatted
added ability to set calibration adjust for data product action (useful for testing with mock)
sensor cal only added to metadata and measurement result if calibration adjust is true
added plugin_name property to sigan_iface; this is used to put the plugin name in the status page and in the metadata
remove "calibration_datetime" in global section of metadata, replaced by calibration object in capture
fix calculation of duration in metadata in the m4s action - this appeared to not be converted to milliseconds as expected (always showed 0 in metadata)
changed the logic in the base action configure_preselector method to first check if preselector is configurable
test data product action updated to be consistent with cbrs measure baseline action
actions and test actions (except logger) only loaded if SIGAN_MODULE and SIGAN_CLASS are set to the mock sigan in scos-actions
~~added sigan to mock GPS constructor just like the scos-usrp USRPLocation class~~
Due to sigan and GPS objects being initialized in scos-sensor instead of scos-usrp, sensor object now passed to GPS methods in order for scos-usrp to access USRP API for GPS. Previously sigan was passed to GPS Interface implementation through constructor.
Updated to be compatible with the latest scos-actions:
- Acquire IQ called though sensor object rather than sigan with sensor object now handling calibration adjustments
- Sensor overload code moved from scos-usrp to sensor in scos-actions
- remove clock_rate_lookup_by_sample_rate related code, instead scos-usrp will always maximize clock_rate based on sample rate
Check if temperature exists in cal data before adding to cal metadata

…not cal_adjust, remove debug messages

…_sensor_calibration_data

…object in capture

…A-178_test_actions_loading

dboulware · 2024-03-13T21:46:24Z

scos_actions/configs/actions/test_SEA_CBRS_Measure_Baseline.yml

@@ -1,26 +1,22 @@
 nasctn_sea_data_product:
-  name: test_nasctn_sea_data_product
+  name: test_SEA_CBRS_Measure_Baseline
  rf_path: antenna


I think this same rf_path: antenna param should be added to all of the test actions to allow them to work with a configurable preselector or without a preselector. Currently, they will all fail on a sensor if it has a configurable preselector.

Fixed in 8d205e5

…A-178_test_actions_loading

dboulware · 2024-04-24T18:59:34Z

scos_actions/hardware/sensor.py

@@ -246,6 +246,26 @@ def recompute_calibration_data(self, params: dict) -> None:
        if not recomputed:
            logger.warning("Failed to recompute calibration data")

+    def check_sensor_overload(self, data) -> bool:


It looks like data is expected to be an ndarray? I suggest adding a type hint. Also, is there any danger that data could not be cast to np.complex64? I'm not sure.

dboulware · 2024-04-24T19:00:18Z

scos_actions/hardware/sensor.py

+            10 * np.log10(1 / (2 * 50)) + 30
+        )  # Convert log(V^2) to dBm
+        # explicitly check is not None since 1db compression could be 0
+        if self.sensor_calibration_data["compression_point"] is not None:


Suggest moving this above so you don't compute the avg power if you don't know the compression point.

Looks like this is only called if there is compression_point so maybe the previous comment can be disregarded unless there is a chance check_sensor_overload could be called in a different flow.

dboulware · 2024-04-24T19:46:06Z

scos_actions/settings.py

@@ -26,6 +26,10 @@
 logger.debug(f"scos-actions: RUNNING_TESTS:{RUNNING_TESTS}")
 FQDN = env("FQDN", None)
 logger.debug(f"scos-actions: FQDN:{FQDN}")
+SIGAN_MODULE = env.str("SIGAN_MODULE", default="scos_actions.hardware.mocks.mock_sigan")


I think I would only set the defaults for these when running tests.

dboulware · 2024-04-24T19:48:16Z

scos_actions/discover/__init__.py

-    ),
-    "logger": Logger(),
-}
+actions = {"logger": Logger()}


Should we remove logger from the actions? Not a big deal either way.

dboulware

Looks good. See comments for a couple minor suggestions.

jhazentia added 29 commits February 5, 2024 09:20

only update test actions if using scos-actions mock sigan

99ecc9f

change configure preselector logic

d13baee

configurable cal adjust for data product

9829efc

debug log messages

835e649

only add sensor cal to capture if sensor cal in result

db5ae40

only set cal datetime if cal_adjust

d9e6f88

check for cal data before gettting cal datetime, memory debug

002ec32

memory debug

e070087

log messages for debug

c054376

comment out debug

ea2eefe

remove debug code

7f79201

use cal adjust in sea data product action, don't get cal datetime if …

322d096

…not cal_adjust, remove debug messages

fix cal_adjust bugs

08d72e0

add constructor to mock gps to match actual gps

b36f36d

fix tests

bda63db

autoformat code, always add logger to test actions

062e6ce

use test data product action from scos-tekrsa

3eaf79e

fix bug in multi freq IQ action, small change to mock sigan recompute…

a70ce1b

…_sensor_calibration_data

remove "calibration_datetime" from metadata, replaced by Calibration …

0d26e5b

…object in capture

fix m4s graph name

5696802

revert previous change

a683cf8

autoformat, fix format problem

74cac26

update formatting to prevent bad autoformat

adb5383

Merge branch 'master' of https://github.com/NTIA/scos-actions into SE…

f7f08b3

…A-178_test_actions_loading

fix m4s action duration in metadata

ab657a9

add plugin_name property to sigan iface

c56da56

add docstring

01c2764

round to convert to int for m4s duration

9c0718a

increment version, autoformat

9e600f8

jhazentia marked this pull request as ready for review March 11, 2024 20:07

dboulware self-requested a review March 13, 2024 21:45

dboulware reviewed Mar 13, 2024

View reviewed changes

jhazentia added 14 commits March 27, 2024 12:50

pass sigan for gps through method calls instead of constructor

91e3eff

check if CAL_ADJUST param exists, slight logging improvement

d06098f

Merge branch 'master' of https://github.com/NTIA/scos-actions into SE…

7ca107a

…A-178_test_actions_loading

fix error from merge

3c37524

add rf_path to test actions

8d205e5

autoformat

b43b962

only check compression_point if cal_adjust

0a8621a

autoformat

a632242

change GPS methods to use sensor, add type hints

93a32d0

fix circular import

d310202

move sensor overload check from scos-usrp to sensor class

876b6a6

remove clock_rate_lookup_by_sample_rate, remove unused import

9f1b040

only add temperature to cal metadata if it exists

6638bfd

only load yaml actions if using scos_actions mock sigan

8806dec

jhazentia requested a review from dboulware April 16, 2024 19:54

jhazentia added 2 commits April 17, 2024 14:07

change version to 10.0.0

a58f0eb

fix bug in sync gps action

a050817

dboulware reviewed Apr 24, 2024

View reviewed changes

dboulware requested changes Apr 24, 2024

View reviewed changes

Address feedback

7c0454d

dboulware merged commit ed7679f into master Apr 26, 2024
4 checks passed

jhazentia deleted the SEA-178_test_actions_loading branch April 26, 2024 15:13

dboulware restored the SEA-178_test_actions_loading branch April 26, 2024 16:32

dboulware mentioned this pull request Apr 26, 2024

Revert "Sea 178 test actions loading" #117

Merged

jhazentia mentioned this pull request Apr 26, 2024

Sea 178 test actions loading #118

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sea 178 test actions loading #110

Sea 178 test actions loading #110

jhazentia commented Feb 20, 2024 •

edited

Loading

dboulware Mar 13, 2024

jhazentia Apr 16, 2024

dboulware Apr 24, 2024

dboulware Apr 24, 2024

dboulware Apr 24, 2024

dboulware Apr 24, 2024

dboulware Apr 24, 2024

dboulware left a comment

Sea 178 test actions loading #110

Sea 178 test actions loading #110

Conversation

jhazentia commented Feb 20, 2024 • edited Loading

dboulware Mar 13, 2024

Choose a reason for hiding this comment

jhazentia Apr 16, 2024

Choose a reason for hiding this comment

dboulware Apr 24, 2024

Choose a reason for hiding this comment

dboulware Apr 24, 2024

Choose a reason for hiding this comment

dboulware Apr 24, 2024

Choose a reason for hiding this comment

dboulware Apr 24, 2024

Choose a reason for hiding this comment

dboulware Apr 24, 2024

Choose a reason for hiding this comment

dboulware left a comment

Choose a reason for hiding this comment

jhazentia commented Feb 20, 2024 •

edited

Loading